When swapping directors, keep members active that are filling other roles #3501

CarsonF · 2025-06-17T17:55:56Z

coderabbitai · 2025-06-17T18:00:12Z

📝 Walkthrough

"""

Walkthrough

The codebase updates the logic for replacing project director memberships, introducing conditional handling for members with multiple roles. Now, when a director is swapped, only members with a single role are inactivated; members with multiple roles have only the relevant role removed. Tests are updated to cover this behavior.

Changes

Files/Paths	Change Summary
src/components/project/project-member/project-member.gel.repository.ts, src/components/project/project-member/project-member.repository.ts	Refactored logic for replacing project director memberships to conditionally inactivate or update roles based on member's role count.
src/core/database/query/cypher-functions.ts	Added `disjunction` function to `apoc.coll` for list difference operations.
src/core/database/query/properties/update-property.ts	Modified `conditionalOn` function to wrap `conditionVar` with `varInExp` in imports array.
test/features/director-change-replaces-memberships-on-open-projects.e2e-spec.ts	Enhanced tests to include scenarios with members holding multiple roles and verified correct role removal/inactivation.

Assessment against linked issues

Objective (Issue #)	Addressed	Explanation
Ensure swapping directors does not inactivate members with other roles (#3499)	✅
Remove only the relevant role from members with multiple roles (#3499)	✅
Inactivate membership if the member has only the swapped role (#3499)	✅
Update tests to cover multi-role membership behavior (#3499)	✅

Assessment against linked issues: Out-of-scope changes

No out-of-scope changes found.
"""

✨ Finishing Touches

📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

Review comments: Directly reply to a review comment made by CodeRabbit. Example:
- I pushed a fix in commit <commit_id>, please review it.
- Explain this complex logic.
- Open a follow-up GitHub issue for this discussion.
Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
- @coderabbitai explain this code block.
- @coderabbitai modularize this function.
PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
- @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
- @coderabbitai read src/utils.ts and explain its main purpose.
- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
- @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

@coderabbitai pause to pause the reviews on a PR.
@coderabbitai resume to resume the paused reviews.
@coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
@coderabbitai full review to do a full review from scratch and review all the files again.
@coderabbitai summary to regenerate the summary of the PR.
@coderabbitai generate docstrings to generate docstrings for this PR.
@coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
@coderabbitai resolve resolve all the CodeRabbit review comments.
@coderabbitai configuration to show the current CodeRabbit configuration for the repository.
@coderabbitai help to get help.

Other keywords and placeholders

Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (`.coderabbit.yaml`)

You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
Please see the configuration documentation for more information.
If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

Visit our Documentation for detailed information on how to use CodeRabbit.
Join our Discord Community to get help, request features, and share feedback.
Follow us on X/Twitter for updates and announcements.

coderabbitai

Actionable comments posted: 2

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 6cdf774 and c3073ee.

📒 Files selected for processing (5)

src/components/project/project-member/project-member.gel.repository.ts (1 hunks)
src/components/project/project-member/project-member.repository.ts (2 hunks)
src/core/database/query/cypher-functions.ts (1 hunks)
src/core/database/query/properties/update-property.ts (1 hunks)
test/features/director-change-replaces-memberships-on-open-projects.e2e-spec.ts (5 hunks)

🧰 Additional context used

🧬 Code Graph Analysis (1)

src/core/database/query/properties/update-property.ts (1)

src/core/database/query-augmentation/subquery.ts (1)

varInExp (69-72)

⏰ Context from checks skipped due to timeout of 90000ms (12)

GitHub Check: Generate (head)
GitHub Check: Generate (base)
GitHub Check: Clean
GitHub Check: E2E Tests (neo4j 5/6)
GitHub Check: E2E Tests (neo4j 4/6)
GitHub Check: E2E Tests (neo4j 6/6)
GitHub Check: E2E Tests (neo4j 3/6)
GitHub Check: E2E Tests (neo4j 1/6)
GitHub Check: Unit
GitHub Check: E2E Tests (neo4j 2/6)
GitHub Check: lint
GitHub Check: Analyze (javascript)

🔇 Additional comments (7)

src/core/database/query/cypher-functions.ts (1)

85-89: LGTM! Well-documented APOC function wrapper.

The disjunction function is properly implemented following the existing pattern for APOC wrappers, with clear documentation and a reference URL.

src/core/database/query/properties/update-property.ts (1)

209-209: Consistent variable extraction for conditional imports.

Good change to wrap conditionVar with varInExp for consistent variable name extraction in the imports array.

src/components/project/project-member/project-member.gel.repository.ts (1)

119-120: Clean implementation of the conditional update logic.

The split update strategy with union operation properly handles both cases - inactivating single-role members and removing specific roles from multi-role members.

test/features/director-change-replaces-memberships-on-open-projects.e2e-spec.ts (3)

70-78: Good test coverage for the multi-role scenario.

The new test case properly sets up a member with multiple roles to verify the conditional update behavior.

151-157: Nice refactoring to make the test more maintainable.

Using entries and mapEntries makes the code more dynamic and easier to extend.

265-272: Correct assertions for the multi-role behavior.

The assertions properly verify that members with multiple roles remain active and only lose the replaced role.

src/components/project/project-member/project-member.repository.ts (1)

249-277: Well-implemented conditional logic for role-based updates.

The conditional branching correctly handles:

Members with multiple roles: removes the specific role while keeping them active

Members with a single role: marks them as inactive

The use of disjunction to remove a specific role from the array is appropriate.

src/components/project/project-member/project-member.gel.repository.ts

src/components/project/project-member/project-member.repository.ts

…oles

coderabbitai

Actionable comments posted: 2

🧹 Nitpick comments (2)

test/features/director-change-replaces-memberships-on-open-projects.e2e-spec.ts (2)
70-78: Freeze the roles array to improve type-safety

Marking the literal array as immutable (as const) preserves the exact role string literals and prevents accidental mutation during the test.
-roles: [Role.RegionalDirector, Role.ProjectManager],
+roles: [Role.RegionalDirector, Role.ProjectManager] as const,
151-158: Avoid the entries → mapEntries → asRecord round-trip

You can derive the record in one pass, reducing allocations and improving clarity:
-const resultList = await Promise.all(
-  entries(projects).map(async ([key, project]) => {
-    const results = await fetchMembers(app, project.id);
-    return [key, results] as const;
-  }),
-);
-const results = mapEntries(resultList, (i) => i).asRecord;
+const results = await mapEntries(
+  projects,
+  async (project) => fetchMembers(app, project.id),
+).asRecord;

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between c3073ee and c110e5c.

📒 Files selected for processing (5)

src/components/project/project-member/project-member.gel.repository.ts (1 hunks)
src/components/project/project-member/project-member.repository.ts (2 hunks)
src/core/database/query/cypher-functions.ts (1 hunks)
src/core/database/query/properties/update-property.ts (1 hunks)
test/features/director-change-replaces-memberships-on-open-projects.e2e-spec.ts (5 hunks)

🚧 Files skipped from review as they are similar to previous changes (4)

src/core/database/query/properties/update-property.ts
src/core/database/query/cypher-functions.ts
src/components/project/project-member/project-member.gel.repository.ts
src/components/project/project-member/project-member.repository.ts

⏰ Context from checks skipped due to timeout of 90000ms (12)

GitHub Check: Generate (base)
GitHub Check: Generate (head)
GitHub Check: Clean
GitHub Check: E2E Tests (neo4j 3/6)
GitHub Check: E2E Tests (neo4j 4/6)
GitHub Check: E2E Tests (neo4j 6/6)
GitHub Check: Unit
GitHub Check: E2E Tests (neo4j 5/6)
GitHub Check: E2E Tests (neo4j 2/6)
GitHub Check: E2E Tests (neo4j 1/6)
GitHub Check: Analyze (javascript)
GitHub Check: lint

test/features/director-change-replaces-memberships-on-open-projects.e2e-spec.ts

coderabbitai bot reviewed Jun 17, 2025

View reviewed changes

src/components/project/project-member/project-member.gel.repository.ts Outdated Show resolved Hide resolved

src/components/project/project-member/project-member.repository.ts Outdated Show resolved Hide resolved

When swapping directors, keep members active that are filling other r…

c110e5c

…oles

CarsonF force-pushed the project-member/no-auto-inactivate-member-with-roles branch from c3073ee to c110e5c Compare June 17, 2025 18:02

coderabbitai bot reviewed Jun 17, 2025

View reviewed changes

test/features/director-change-replaces-memberships-on-open-projects.e2e-spec.ts Show resolved Hide resolved

test/features/director-change-replaces-memberships-on-open-projects.e2e-spec.ts Show resolved Hide resolved

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

When swapping directors, keep members active that are filling other roles #3501

When swapping directors, keep members active that are filling other roles #3501

Uh oh!

CarsonF commented Jun 17, 2025

Uh oh!

coderabbitai bot commented Jun 17, 2025 •

edited

Loading

Walkthrough

Changes

Assessment against linked issues

Assessment against linked issues: Out-of-scope changes

Chat

Support

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (`.coderabbit.yaml`)

Documentation and Community

Uh oh!

coderabbitai bot left a comment

Uh oh!

Uh oh!

Uh oh!

coderabbitai bot left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

When swapping directors, keep members active that are filling other roles #3501

Are you sure you want to change the base?

When swapping directors, keep members active that are filling other roles #3501

Uh oh!

Conversation

CarsonF commented Jun 17, 2025

Uh oh!

coderabbitai bot commented Jun 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Assessment against linked issues

Assessment against linked issues: Out-of-scope changes

Chat

Support

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (.coderabbit.yaml)

Documentation and Community

Uh oh!

coderabbitai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

coderabbitai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

coderabbitai bot commented Jun 17, 2025 •

edited

Loading

CodeRabbit Configuration File (`.coderabbit.yaml`)